From acf584b42f306caddc6e9d8491e6e169b5da0108 Mon Sep 17 00:00:00 2001
From: Debian LibreOffice Maintainers <debian-openoffice@lists.debian.org>
Date: Wed, 10 Oct 2018 22:25:32 +0100
Subject: [PATCH] javadoc-optional

Gemeinsame Unterverzeichnisse: odk-old/config und odk/config.
Gemeinsame Unterverzeichnisse: odk-old/docs und odk/docs.
Gemeinsame Unterverzeichnisse: odk-old/examples und odk/examples.

Gbp-Pq: Name javadoc-optional.diff
---
 Repository.mk             |   2 +-
 configure.ac              | Bin 459608 -> 460336 bytes
 odk/CustomTarget_check.mk |   2 +-
 odk/Module_odk.mk         |   6 ++++--
 odk/util/check.pl         |   2 +-
 5 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/Repository.mk b/Repository.mk
index 9fbb2ce7169..3acad9d8083 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -869,7 +869,7 @@ $(eval $(call gb_Helper_register_packages_for_install,sdk,\
 	offapi_idl \
 	udkapi_idl \
 	$(if $(ENABLE_JAVA), \
-		odk_javadoc \
+		$(if $(JAVADOC),odk_javadoc) \
 		odk_uno_loader_classes \
 		odk_unowinreg \
 	) \
diff --git a/configure.ac b/configure.ac
index b599837d33cda4869e28032eed1b1e8bc5718ac5..9715c5d26eb99d2e8b4e16fc056348c8ef8361d2 100644
GIT binary patch
delta 558
zcmY*WO=uHA6lU^fv&oXCYC(<8(lP$DYN{5G5@>8e3`z@yUP|bu?S!nBw2(v*54I>4
z!IOc02NCq(u^P#4iWdd1y?7DCyNFUmy;uaHlkK+9fycc0-uJ$5=FR7aqWM@XdTh*2
zT2imc8^v42+4-3Qm|&;+cTSn07!bx6)QnqlRaMr?N`?f~1?%H^-HR839XEI2b-~0g
zoPuGq(-=O(j^TSZJFv?-r>%MeheBrCY4WyPD^G<g**mIQSkBo@M`SH$lew}_4ishj
zgsK#$=hW2v>`nZv@Lo7Ax{miX7Q?~=!^BX7bJCB&(nM5XwM7@v_kkzzyh%xHw&*av
zIJ^rfk4`q4F%J2TI4*m16hBrY0?+=Cg}WXd!PCFgz4C<iqv_EhIA7@?K6x~V@+01(
z@dVChxDEMDXTPG{Y>dSXtiPcyjQVt;Bi;De4(0FrWaIxoeZ^M^>e;q@?b872NiMPB
zQx-!nDTaGKnTf08SMnpH!`ZZ+0G577QdoRz#0I6TSE{Ne^SOzfE?e=E8%$4cYObn+
sd=CR7ZR$TC(nHa-%*u{#`cmg3D^`3@hgEWyoi^#<I*c`^9o@XP1rn;Yc>n+a

delta 222
zcmdncBXgroreO<XfNc9mIYuC6+Wt|F`N!1h1sQDI)8DUW=9vDVkcD;ng$y><>GLKs
zOH8*9V&R=GFq4^OdhIr5q3ID@nR%yeVrHE_XDhSbbn{I>70<Q;iQG*<Ns(>LGSe5#
z1FE&y#w<NO>o2p&^!#niD$}FWn7O9cRWtKUUk6emu!NCs`h#uEhSLo;GkZ=i+RkhM
z(Y9_ov+VTS_nEk-KidwJz4nG#V7mDZX4~mCJD4S>-&)MZKmFYfpvksNm}T1&cQOMp
O3lOtzPu$6N-Uk5nNmcRy

diff --git a/odk/CustomTarget_check.mk b/odk/CustomTarget_check.mk
index f0b63489f05..2d9d5ee6dcb 100644
--- a/odk/CustomTarget_check.mk
+++ b/odk/CustomTarget_check.mk
@@ -35,7 +35,7 @@ $(call gb_CustomTarget_get_workdir,odk/check)/checkbin : \
 		$(if $(filter WNT,$(OS)),$(call gb_Package_get_target,odk_config_win)) \
 		$(call gb_Package_get_target,odk_docs) \
 		$(call gb_Package_get_target,odk_html) \
-		$(if $(ENABLE_JAVA),$(call gb_GeneratedPackage_get_target,odk_javadoc)) \
+		$(if $(JAVADOC),$(call gb_GeneratedPackage_get_target,odk_javadoc)) \
 		$(call gb_Package_get_target,odk_settings) \
 		$(call gb_Package_get_target,odk_settings_generated) \
 		$(if $(ENABLE_JAVA),$(call gb_Package_get_target,odk_unowinreg))
diff --git a/odk/Module_odk.mk b/odk/Module_odk.mk
index 410f8cf8ef1..363a8a41dea 100644
--- a/odk/Module_odk.mk
+++ b/odk/Module_odk.mk
@@ -43,11 +43,13 @@ ifneq ($(ENABLE_JAVA),)
 $(eval $(call gb_Module_add_targets,odk,\
 	$(if $(and $(BUILD_UNOWINREG),$(filter GCC,$(COM))),CustomTarget_unowinreg)\
 	CustomTarget_classes \
-	CustomTarget_javadoc \
-	GeneratedPackage_odk_javadoc \
 	GeneratedPackage_uno_loader_classes \
 	$(if $(filter WNT,$(OS)),Library_unowinreg) \
 	Package_unowinreg \
+	$(if $(JAVADOC),\
+		CustomTarget_javadoc \
+		GeneratedPackage_odk_javadoc \
+	) \
 ))
 endif
 
diff --git a/odk/util/check.pl b/odk/util/check.pl
index 03b58fe3da7..63e332079bc 100644
--- a/odk/util/check.pl
+++ b/odk/util/check.pl
@@ -184,7 +184,7 @@ if (-d "$SdkDir") {
     # improvement required
     my $solar_java = $ENV{"ENABLE_JAVA"};
     my $JDK = $ENV{"JDK"};
-    if (defined($solar_java) && $solar_java ne "" && (!defined($JDK) || $JDK ne "gcj")) {
+    if (defined($solar_java) && $solar_java ne "" && $ENV{"JAVADOC"} ne "") {
     print "check java docu: ";
     if (check_dir("docs/java/ref")) {
         if (!check_file("docs/java/ref/index.html")) {
-- 
2.30.2